From e4dc23c48e411f6e1dd635a3797b265a70d1a2e9 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 5 Jan 2007 18:05:15 +0000 Subject: [PATCH] Fix broken width computation, again. 2007-01-05 Behdad Esfahbod * gtk/gtklabel.c (get_layout_location): Fix broken width computation, again. svn path=/trunk/; revision=17083 --- ChangeLog | 5 +++++ gtk/gtklabel.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7dfb7327b2..453924e480 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-01-05 Behdad Esfahbod + + * gtk/gtklabel.c (get_layout_location): Fix broken width computation, + again. + 2007-01-05 Carlos Garnacho * gtk/gtknotebook.c (gtk_notebook_size_request): take into account diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 219f01e898..e479bf4391 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -2301,8 +2301,9 @@ get_layout_location (GtkLabel *label, width = pango_layout_get_width (label->layout); pango_layout_get_pixel_extents (label->layout, NULL, &logical); - /* width may be -1 */ - req_width = MIN(PANGO_PIXELS (width), logical.width); + req_width = logical.width; + if (width != -1) + req_width = MIN(PANGO_PIXELS (width), req_width); req_width += 2 * misc->xpad; } else -- 2.30.2